bitkeeper revision 1.1362 (42680a98yqGgnpTBOHnevLNLv2y9uw)

Minor cleanup of the SH_V*LOG macros.

Signed-off-by: michael.fetterman@cl.cam.ac.uk

diff --git a/xen/arch/x86/shadow.c b/xen/arch/x86/shadow.c
index a91e9ad3bfab916a39ad2f2cc2ac3bc11605c7ab..a99902062aebc0a9f7e4ff62c017904a2e5189c3 100644 (file)
--- a/xen/arch/x86/shadow.c
+++ b/xen/arch/x86/shadow.c
@@ -325,7 +325,7 @@ free_shadow_hl2_table(struct domain *d, unsigned long smfn)
     l1_pgentry_t *hl2 = map_domain_mem(smfn << PAGE_SHIFT);
     int i, limit;
 
-    SH_VVLOG("%s: smfn=%p freed\n", __func__, smfn);
+    SH_VVLOG("%s: smfn=%p freed", __func__, smfn);
 
 #ifdef __i386__
     if ( shadow_mode_external(d) )
@@ -2435,7 +2435,7 @@ int shadow_fault(unsigned long va, struct xen_regs *regs)
 
     spte = l1e_empty();
 
-    SH_VVLOG("shadow_fault( va=%p, code=%lu )", va, regs->error_code );
+    SH_VVLOG("shadow_fault( va=%p, code=%lu )", va, regs->error_code);
     perfc_incrc(shadow_fault_calls);
     
     check_pagetable(ed, "pre-sf");
@@ -2458,7 +2458,7 @@ int shadow_fault(unsigned long va, struct xen_regs *regs)
     __guest_get_l2e(ed, va, &gpde);
     if ( unlikely(!(l2e_get_flags(gpde) & _PAGE_PRESENT)) )
     {
-        SH_VVLOG("shadow_fault - EXIT: L1 not present" );
+        SH_VVLOG("shadow_fault - EXIT: L1 not present");
         perfc_incrc(shadow_fault_bail_pde_not_present);
         goto fail;
     }
@@ -2470,7 +2470,7 @@ int shadow_fault(unsigned long va, struct xen_regs *regs)
     orig_gpte = gpte = linear_pg_table[l1_linear_offset(va)];
     if ( unlikely(!(l1e_get_flags(gpte) & _PAGE_PRESENT)) )
     {
-        SH_VVLOG("shadow_fault - EXIT: gpte not present (%lx)",gpte );
+        SH_VVLOG("shadow_fault - EXIT: gpte not present (%lx)", gpte);
         perfc_incrc(shadow_fault_bail_pte_not_present);
         goto fail;
     }

diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h
index bbf6f79aa79e31ec0c3534ac5a91253dbe50e99a..79fc53142993bec7c4f53739bf8e9d066f1c1e04 100644 (file)
--- a/xen/include/asm-x86/shadow.h
+++ b/xen/include/asm-x86/shadow.h
@@ -240,7 +240,7 @@ extern int shadow_status_noswap;
     printk("DOM%uP%u: SH_LOG(%d): " _f "\n",                            \
        current->domain->id , current->processor, __LINE__ , ## _a )
 #else
-#define SH_LOG(_f, _a...) 
+#define SH_LOG(_f, _a...) ((void)0)
 #endif
 
 #if SHADOW_VERBOSE_DEBUG
@@ -248,7 +248,7 @@ extern int shadow_status_noswap;
     printk("DOM%uP%u: SH_VLOG(%d): " _f "\n",                           \
            current->domain->id, current->processor, __LINE__ , ## _a )
 #else
-#define SH_VLOG(_f, _a...) 
+#define SH_VLOG(_f, _a...) ((void)0)
 #endif
 
 #if SHADOW_VVERBOSE_DEBUG
@@ -256,7 +256,7 @@ extern int shadow_status_noswap;
     printk("DOM%uP%u: SH_VVLOG(%d): " _f "\n",                          \
            current->domain->id, current->processor, __LINE__ , ## _a )
 #else
-#define SH_VVLOG(_f, _a...)
+#define SH_VVLOG(_f, _a...) ((void)0)
 #endif
 
 #if SHADOW_VVVERBOSE_DEBUG
@@ -264,7 +264,7 @@ extern int shadow_status_noswap;
     printk("DOM%uP%u: SH_VVVLOG(%d): " _f "\n",                         \
            current->domain->id, current->processor, __LINE__ , ## _a )
 #else
-#define SH_VVVLOG(_f, _a...)
+#define SH_VVVLOG(_f, _a...) ((void)0)
 #endif
 
 #if FULLSHADOW_DEBUG
@@ -272,7 +272,7 @@ extern int shadow_status_noswap;
     printk("DOM%uP%u: FSH_LOG(%d): " _f "\n",                           \
            current->domain->id, current->processor, __LINE__ , ## _a )
 #else
-#define FSH_LOG(_f, _a...) 
+#define FSH_LOG(_f, _a...) ((void)0)
 #endif